Fix some flaky tests

diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs
index e83bbdadd7431f1cd55305a51b3a55963e2a8a61..e8d83c3f5ff273c93544ab43d3c8401f610e4e61 100644 (file)
--- a/tests/test_cargo_compile_custom_build.rs
+++ b/tests/test_cargo_compile_custom_build.rs
@@ -741,7 +741,7 @@ test!(output_separate_lines {
         .file("build.rs", r#"
             fn main() {
                 println!("cargo:rustc-flags=-L foo");
-                println!("cargo:rustc-flags=-l foo");
+                println!("cargo:rustc-flags=-l foo:static");
             }
         "#);
     assert_that(p.cargo_process("build").arg("-v"),
@@ -750,6 +750,6 @@ test!(output_separate_lines {
 {compiling} foo v0.5.0 (file://[..])
 {running} `rustc build.rs [..]`
 {running} `[..]foo-[..]build-script-build`
-{running} `rustc [..] --crate-name foo [..] -L foo -l foo`
+{running} `rustc [..] --crate-name foo [..] -L foo -l foo:static`
 ", compiling = COMPILING, running = RUNNING).as_slice()));
 })

diff --git a/tests/test_cargo_compile_git_deps.rs b/tests/test_cargo_compile_git_deps.rs
index 6f80894868b9f1282f56514924eec3eae2f58738..8d8f45dededcbe775bcbe4a3f38d1f81c81f4154 100644 (file)
--- a/tests/test_cargo_compile_git_deps.rs
+++ b/tests/test_cargo_compile_git_deps.rs
@@ -1175,9 +1175,9 @@ test!(git_repo_changing_no_rebuild {
     assert_that(p1.process(cargo_dir().join("cargo")).arg("build"),
                 execs().with_stdout(format!("\
 {updating} git repository `{bar}`
-{compiling} bar v0.5.0 ({bar}#[..])
-{compiling} p1 v0.5.0 ({url})
-", updating = UPDATING, compiling = COMPILING, url = p1.url(), bar = bar.url())));
+{compiling} [..]
+{compiling} [..]
+", updating = UPDATING, compiling = COMPILING, bar = bar.url())));
 
     // Make a commit to lock p2 to a different rev
     File::create(&bar.root().join("src/lib.rs")).write_str(r#"
@@ -1201,9 +1201,9 @@ test!(git_repo_changing_no_rebuild {
     assert_that(p2.cargo_process("build"),
                 execs().with_stdout(format!("\
 {updating} git repository `{bar}`
-{compiling} bar v0.5.0 ({bar}#[..])
-{compiling} p2 v0.5.0 ({url})
-", updating = UPDATING, compiling = COMPILING, url = p2.url(), bar = bar.url())));
+{compiling} [..]
+{compiling} [..]
+", updating = UPDATING, compiling = COMPILING, bar = bar.url())));
 
     // And now for the real test! Make sure that p1 doesn't get rebuilt
     // even though the git repo has changed.